Reconcile with jb-mr0-release jb-release

Change-Id: Id8ba9e1858f97ba17d9f9b9080c0e18c0bebfa7b