Reconcile with jb-mr1-release - do not merge

Change-Id: I2d81c143dd737e9faf93df9a104d79f7f36fd429