Merge from ics-mr0

Change-Id: I5667c315fab589a2dc39e000a81397d317691895