Reconcile with ics-mr1-release

Change-Id: Iaea0ecf6fc4429640a1d8811ec2034ea0f9eb48e