Merge tag 'android-7.1.2_r29' into N