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

Change-Id: I0f1a944b0712e935eddbed06b6a0006b0089abc2