Merge tag 'android-4.3_r3' into r3

Android 4.3 release 3.0

Change-Id: I39d13cb2884664ab2c59ca245fa076d1d4d2cfe5