Reconcile with ics-mr1-release

Change-Id: Ib3cb0799cd54228f43fa27fdf618cbcc0cea18a1