After merging https://github.com/GoogleCloudPlatform/google-cloud-python/pull/2680, there is still some discussion about the surface that we expose.