Fix google3 migration issues

Test: Manually
Change-Id: I97fff06c9cc3be6c9cb3f545edde3ed2b603157f
4 files changed