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

Change-Id: I8e6b252cb0d4b89351a9fbf83ac46fe94c11e886