Thanks @dpcollins-google, the fix is straighforward, but please explain your strategy for reaching the right broker in #4212 because the client could have issues later.

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}