Reconcile with ics-mr1-release

Change-Id: Ic9874b49320490dd0db8484b0783adb82fa50dc6