Address comments from #725016

Test: ran this
Change-Id: Iedda798519297499a1d6d28e4aac2199456e9e92
1 file changed