Reconcile with ics-mr1-release

Change-Id: Icbe033444524bc3b55a7dfb4fa21fca1f3b65b51