Address leftover comments on aosp/1212191

Test: TH
Bug: 149467454
Change-Id: Id19456693c0b4173cc4065463c037f01733c7a56
1 file changed