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

Change-Id: I788e28f1f2a2d2a41c5c49097da31417b476cfcb