Reconcile with ics-mr1-release

Change-Id: Icab4caf108e40f8c9ff384a58f6ae556529efa84