Reconcile with ics-mr1-release

Change-Id: Iffbcc124ea828ed0db71df4c192a5f88c43738f9