Reconcile with ics-mr1-release

Change-Id: I4b9445667934514a9c04ed8df17f422d7c3755aa