Reconcile with jb-mr1-release - do not merge

Change-Id: I1253d2b70d2ba5be1771d5824386c8c42bdbdf0f