Merge remote-tracking branch 'AOSP/jb-mr1-release' into jb-ras-mr1