Merge "Flatten the CDS grpc request payload"