Address comments at aosp/2658225

Test: This
Bug: 269409485
Change-Id: I6bfde26939e7cb5970f90fe5c663bcb55d3700d9
1 file changed