Merge "Fixed memory leak with svc_test.cc"