Reconcile with ics-mr1-release

Change-Id: I0f886881d60df0aa053f019592baa0dd1ddb9424