Reconcile with ics-mr1-release

Change-Id: I91cfa5357d3530b04123a4faf703598994b2ed5a