More information: https://docs.google.com/a/google.com/document/d/1lzK04DqCZgjOoGQfBT053QIrCvlsyAAwLo0jfqcN6ds/edit?usp=sharing Tested: TAP --sample ran all affected tests and none failed http://test/OCL:324422822:BASE:324408434:1596318556672:a8b3beed PiperOrigin-RevId: 324621068
