Reconcile with jb-mr1-release - do not merge

Change-Id: Ic024d25bb6750ddb85556f5e12f407eaee40086e