Reconcile with ics-mr1-release

Change-Id: I16b26450c0def0dbea7c50d37d74a15cbb9ba93a