Reconcile with ics-mr0-release

Change-Id: I4539d65f411a9a9acf6eb998e9aa6d5b4e0a1368