Merge "Increase num_retries to reduce likelihood of test flake"