Android 4.2 preview 3
Merge branch 'upstream'