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

Change-Id: I87459602566f8cf22c032a4f279c8ef023c83b71