Reconcile with jb-mr0-release jb-release

Change-Id: I8b44c9fafc5d0a2c0d6ad959c5e2ed0ae02b3f54