More information: https://docs.google.com/document/d/16tpK6aXqN68PvTyvt4siM-m7f0NXi_8xEeitLDzr8xY/edit?usp=sharing Tested: TAP --sample ran all affected tests and none failed http://test/OCL:278915274:BASE:278884711:1573074344615:a6701677 PiperOrigin-RevId: 279080514
