Reconcile with jb-mr1.1-release - do not merge

Change-Id: I97991f966ea0d3a6f3bad87c82d9926d55e6d63c