Address comments in ag/1785007.

Test: Tests pass.
Change-Id: I73547d399329e5b4c0527c86fe6817150945bbd7
(cherry picked from commit 18430f69bcf46df19f5752926bc943a93bda20be)
2 files changed