Merge 4.14.39 into android-4.14