am bde41be6: am 6b3c7757: am 8fd74831: Source change to get code compiling on google3

* commit 'bde41be6d998a4520332f16ef0072e08a86a0a6f':