Reconcile with jb-mr0-release jb-release

Change-Id: I64ab1cee03a49427cd6fe1468f984cd3c113d8b1