Address ag/11592772 leftover comments

Test: TH
Bug: 156313635
Change-Id: I3180050ca658deb14fbe86f0af6ba903a40564a4
1 file changed