Merge "Fix compat change CTS test flakiness"