Merge "Attempt to de-flake tests."