Reconcile with jb-mr1-release - do not merge

Change-Id: I482192b20bde4fcc55f9a781e37256d396c2c9fb