merge android-4.3_r2.2 into jb.4.3

Change-Id: Ia7a8df7c4582d43000723c33c7e6b81682214b54