Follow up for a comment from ag/7080956

Test: treehugger
Bug: 128459529
Change-Id: I79a559b3f992eae38bface74383a7a42d2261769
5 files changed