Merge branch 'AOSP/jb-mr2.0.0-release'