Reconcile with jb-mr1-release - do not merge

Change-Id: I2c45a6566f7eff107fa320d407fce712616e6801