Remove some potential test flakiness.

Bug: 2441548
2 files changed