Merge 4.14.95 into android-4.14-p