Reconcile with ics-mr1-release

Change-Id: Ic3ab1dc8924cb9a64bbc0e90e421fa79507ea821