Reconcile with ics-mr0-release

Change-Id: I31e1169ee475b2a5b6fe957f36a37dde1eca265d