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