Reconcile with ics-mr1-release

Change-Id: I90f80bed70319b9973996b74f78b421b87eef8e7