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

Change-Id: I2cc359dc6ba475b9fff93cb18cb9a1c43d6e3acb