Merge "Increase 2ms to 5ms to reduce flake."