Merge "Increase timeout for fuzz_service_test" into main