Reconcile with ics-mr0-release

Change-Id: Ic9c1f854ee1354561f95361401cc9ab6755f4355