Reconcile with jb-mr1-release - do not merge

Change-Id: Ib4bc9a66f8bec3fb2d512fd7d25cfebf192e0009