Reconcile with jb-mr1-release - do not merge

Change-Id: Ib7e2e2f580ebb5ce162fc92cf0f161bec2b140fd