Reconcile with jb-mr1-release - do not merge

Change-Id: Ice14c1907d8834bd141dc9d06ccb0d0e7f0f04d5