Reconcile with ics-mr1-release

Change-Id: If78df17136dfe425e6752b315590b47d4c135d21