Reconcile with jb-mr1-release - do not merge

Change-Id: I2c7dc58d384802df352438ef14c32654d1271a61