Merge 4.14.4 into android-4.14