Merge "Prevent an ASAN failure for svc tests"