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

Change-Id: I37ac21819a4935135534567a0e6d2f5732a17f33