Reconcile with ics-mr1-release

Change-Id: I3f3a977f341cca1f9e0b4a0567fe5fb9f6dd7e0d