Reconcile with jb-mr1-release - do not merge

Change-Id: I317b42faec06d2263a72eca468ba9673f1bd4372