android-4.3_r3

Change-Id: I51bf8d6b2408c64ca89868a2f05a7b571ebcfbba