Reconcile with jb-mr1-release - do not merge

Change-Id: Ic403828b8524b7e72d3599956329d14fcc34a131