Reconcile with ics-mr0-release

Change-Id: I16a4177148eb8ce12f14af9628c9f5143ba0b836