Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01

Change-Id: I3ccb25bf7cde2c22f52260cae0e9957517e6bb5f
Snapshot b80adb2c263702442cf2f2d771168400e6ceb9f8

Change-Id: I391d8e1be1a61e68b01f0db371dbb4ed3e5b5933
Merge android-4.2.2_r1 into dev-mips-jb-mr1

Change-Id: I0858911fd8c3b6d850ac4498a4ead04958e690e0