merge android-4.3_r2.2 into jb4.3

Change-Id: I5aff7bb602ba28b6a20113bdb5dee99db7fa951a