Address followup comments on ag/2665451

Test: Manual
Change-Id: I536ffe078ba02f22bba32b42f6aff05d30e8891c
1 file changed