Reconcile with jb-mr1-release - do not merge

Change-Id: I19e7e1476178dc94e3debb6bec3241b3d9070db0