4.2.2_r1 round2

Change-Id: Id77aa25196e1155a725d2d78710787c61084cbb8
Merge "4.2.2_r1 round2" into jb42