Reconcile with ics-mr1-release

Change-Id: I409eea7f746a37d96ba1af9b60488d93e7e39d96