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

Change-Id: I62fe0d8e8c927ef31e1d3cd44775a7018828af95