Update code so it compiles on google3

Change-Id: I76c6a5264585c8ad4ded22501d2e2ee1672308c3
3 files changed