Reconcile with jb-mr0-release jb-release

Change-Id: I241c11b89af86b312a9112a0004efb3ab6aaa3f6