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

Change-Id: Ib3966b6c9ec856c39096899083cb41fa25434047