android-4.3_r3.1

Change-Id: If71d8652096476007a3e32fab773241032a20305
Fix conflict