Merge 4.14.94 into android-4.14-p