Reconcile with jb-mr0-release jb-release

Change-Id: I897c49519ec349c3ac0fd8d1ca85f5cb7d8a27c9