Reconcile with ics-mr1-release

Change-Id: I74f76af25bae16a84c3d39dac24437a814f58e22