Reconcile with ics-mr1-release

Change-Id: Ib6c72245d2135fe255c5dada01754cb5e03d761c