Reconcile with jb-mr1-release - do not merge

Change-Id: I2158d0cd4ff2c94fad7af68bc20e2ca2ca03a2dd