Reconcile with ics-mr1-release

Change-Id: I0397024e158917812d540e13b87c553d1491eda2