Merge branch 'jb-mr1' of github.com:Root-Box/platform_manifest into jb-mr1