Reconcile with ics-mr1-release

Change-Id: I0744cb47040113f10574e458f604d92bcb2a3fce