Fix issues migrating to Google3

Bug: 140077022
Test: Manual on emulator
Change-Id: I91dd530b2bfff8e5de3b718d625fd8573952407a
2 files changed