Merge "Improve flakiness of PlatformCompatGating test"