Snapshot 7ddd630e136a035ba463c427285c5c3e9f199ee0

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