Reconcile with ics-mr1-release

Change-Id: Ic0f9a64c485c5ecea6eb2e28b96b477371092e82