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

Change-Id: Ie75896ec89b34fe067a2d1c6b34309629459228b