Reconcile with ics-mr1-release

Change-Id: I439bf2369cf391110b265bcd6f482b26bec2ecdc