Addressed missed comments from ag/24539449

The CL with Change-ID Ib6b124db4108d11260b220cc57444007b9d865a6
was submitted before all reviewers had a chance to take a look.

Addressing missed comments here.

Bug: 293587049
Bug: 278783893
Test: presubmit
Change-Id: I2946c0216935a35af05a3f74f1e2a5bd8e23fed1