Reconcile with ics-mr1-release

Change-Id: Ib089acee59a2ac7913b5d35185f165f777800626