Reconcile with ics-mr0-release

Change-Id: Ic661c126d1de39077a150425601c8b32980e9d14