Follow-up changes to ag/2478826.

Test: It builds.
Bug: 62773467
Change-Id: Id1742e162af37aaeba0a28009ea41bb936f9bc34
2 files changed