Android 4.2.2 release 1.2
merge in jb-mr1-release history after reset to jb-mr1-dev