Reconcile with ics-mr0-release

Change-Id: Ifdc1b145e1f778260a1445c954ea2e7848e67c19