Merge tag 'android-4.2.2_r1' into jb-mr1

Change-Id: I0e0c3306af93e340c4d1fae0da699db99c98bdf9