Reconcile with jb-mr2-release - do not merge

Change-Id: I36bc10874ee057cbcba8dc3d9d6c49415bfece45