Reconcile with ics-mr0-release

Change-Id: Icfb81d16af9ed24eb0ede20cca7132a3793033c4