Merge tag 'android-4.3_r3' into r3

Android 4.3 release 3.0

Change-Id: I91cd5cebfccc8759b6a03c4d234014668e1ec2ae