Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I2aa7b529ff2118578e20b857973f1763922a96a7