Reconcile with ics-mr0-release

Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079