Merge tag 'android-4.3_r3.1' into HEAD

Android 4.3 Release 3.1

Change-Id: Ieb02deff196e6c13c0aa1cd866c1ea9332a25f0d