merge android-4.3_r2.2 into jb4.3

Change-Id: I915c3f9241be05d05535765f6696b83bf6b79dcf