Reconcile with jb-mr1-release - do not merge

Change-Id: Idc1f130f1db6f6312680a512439eb7a7a0a5110e