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

Change-Id: I088f7356b684381f971b7e9f6773ba24f7f9b62a