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

Change-Id: Ib081b6a0369bd5a597e53ee3a5551f5a63b67939