Reconcile with ics-mr1-release

Change-Id: Ibe316736f0950895ab45fc511e2828c8a331f8f5