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

* commit '6b3c775727d55a0aa5b25d0ea89b939b71624cd2':
  Source change to get code compiling on google3