Reconcile with ics-mr1-release

Change-Id: I3630f339035d2ce8f5faec4c35bd04ce1001e02c