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

Change-Id: I204c53690f99803900e6613188a6d9a14370e007