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

Change-Id: I8de173f6b24b2f82b20e568e577878d8539e5148