Reconcile with jb-mr1-release - do not merge

Change-Id: Iac4864a4ff7fde786a683be41565200442024d54