No-op merge from ics-mr0

Change-Id: I7855bfa516589c3176e6d9ae546df3a2c5e9e971