merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger authored
cc55503c