Reconcile with ics-mr0-release

Change-Id: I0e118040919876db2c9f4c5b4818c7fc8d5ba156