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

Change-Id: I87313b00fc7435d079f0270cf0140dd57436e67a