Reconcile with ics-mr1-release

Change-Id: I5e32c5ab33c5beeab7576a1984dc0add942c590b