Reconcile with ics-mr1-release

Change-Id: I2790bcf28bdac1335b4106138fc6ad471ac40516