DO NOT MERGE - Backport master API changes

Backport linter error fixes from a reveal API change in master (see
ag/20832242)

Bug: 259947071
Test: presubmits
Change-Id: I024248b00023baa77fbb6c4e1f5cb7000d1c67db
2 files changed