Merge 4.14.55 into android-4.14