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

Change-Id: I2bf1cf80a9166d9d8d574f811a6ea60f498b0f05