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

Change-Id: I130963155d1be3ddd2b1868b2f2ff0aa55411a19