Reconcile with ics-mr1-release

Change-Id: Icb875d44d67d0d2c6befa309453a464668289ccd