Reconcile with ics-mr1-release

Change-Id: I04db6f7d07f213a6dabec96efd393041f109e174