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

Change-Id: I0daadc68f6e805b600705cf334eb1c093bd40f6e