Reconcile with ics-mr0-release

Change-Id: I73df979432604dda0d826d90e4b0bec6b174e0b8