Merge tag 'Android-4.3_r3' into jellybean-mr2

Android 4.3 release 3.0