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

Change-Id: I99d44c2e57eba3b98e5d217591968559fa3d1fe3