Reconcile with ics-mr0-release

Change-Id: I31dc476c2c38b1af46f4b1f7f0f62e6c6a089da0