Reconcile with jb-mr1-release - do not merge

Change-Id: Ib3edff1606fee3fd6dc4f66ed8588d8a5fab5e07