Reconcile with jb-mr1-release - do not merge

Change-Id: I2c724a28984aa03b2887b3db58bd59699b428e85