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