Reconcile with jb-mr1-release - do not merge

Change-Id: Ib1b937c8a7adceaa522b13529b2b6ad4bb3726aa