Android-4.3_r3

Change-Id: I36dde9b9368ac942a830200619249b5d3b1b3564