Merge "Fix flaky test #5534184" into ics-mr0