Reconcile with ics-mr0-release ics-mr1-release

Change-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c