Merge remote-tracking branch 'remotes/aosp/jb-mr1.1-release' into jb-4.2