Reconcile with ics-mr1-release

Change-Id: I6a64a0f1a121625160e099992ed69637781994d7