These should have been included in the first match but I overlooked them. This involved deleting some of the code that tests Google-internal-only features.