Reconcile with jb-mr1-release - do not merge

Change-Id: I5d3a0c41a1626bdf59f75cd8d989d0d725fc4680