Reconcile with ics-mr0-release

Change-Id: I7388dfaa2145b726609e8b30dea22740cd1b1d7b