Merge from ics-mr1

Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953