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

Change-Id: Ic06ba79213c8ce2c41c8282a333456fd8304636b