Reconcile with jb-mr1-release - do not merge

Change-Id: I2301113fa097ebe2ac744def2795a257290025b6