Merge 4.14.24 into android-4.14