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

Change-Id: I9b3266ac584d4516df04b0afcaddbb955440014e