Fix merge from android-4.3_r3.1