Reconcile with jb-mr1-release - do not merge

Change-Id: I692d63796f64702243898ae1d20d8ce073dc15e6