Reconcile with ics-mr1-release

Change-Id: I93d6301506cdc1b3f549b7cf4dbc8a8b3adeca2b