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:279845168:BASE:279870402:1573537714395:80ca701c PiperOrigin-RevId: 279891832
