Merge tag 'android-4.3_r2.2