Reconcile with jb-mr1-release - do not merge

Change-Id: Ie51b5f85342674d507d7db2e7fb681f0f4088693