Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ib1209178390b84af2e57494299fa9320050154e3