Reconcile with jb-mr0-release jb-release

Change-Id: I07eec6cd323d5491511282a2cd0e7e80c41d513d