Merge "Do not use class variable for clients in ContainerSyncTest"