
Automatic merge from submit-queue Use the first version as thirdparty resource preferredVersion First commit is a one-liner, which implements the server-half of #23985. The other two commits rearrange the test code, and add back a commented out test of thirdparty resource. @lavalamp @nikhiljindal