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

Change-Id: I4a04730079d76f1d050c1bcdeb701bd8bbb79511