android-4.3_r3.1

Change-Id: Iab2600d298c9a30f5ee44cc0946c649343d36aeb