Android 4.1.2 release 2
Merge branch 'upstream'