Merge "Update service name targeted by VTS test"