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

Change-Id: Ie56fbb34384a4cf7d00b2ce89fd69ec434396a05