Reconcile with ics-mr0-release

Change-Id: I58ba7ea1f3e87dcc5fc13ce213a221a311dc4eff