Merge 4.14.36 into android-4.14