Reconcile with ics-mr1-release

Change-Id: I347cd6c1e6227d2c15efdd5f855268dbe12cd497