Reconcile with jb-mr0-release jb-release - do not merge

Change-Id: Icb49e9e1f6c6e2be6d863f959a7a782dd442c465