Reconcile with ics-mr1-release

Change-Id: I2e44bc34002b9d53adf8f7df72c9980f612e6274