Reconcile with ics-mr1-release

Change-Id: I3fef54b8a97aacc580fd6e7158a96df5c091c941