Address comments on ag/10050681.

Test: builds
Bug: 138306002
Change-Id: I7ea39b80eede50288261d05ef6f2e860f30b22d6
1 file changed