Merge "Remove unused client in ServerMetadataTestJSON"