Reconcile with ics-mr1-release

Change-Id: I6c51c02fe1de073b1bb5d3cd73e9a072286b4cb8