Address Alex's comments in the previous CL

Bug: 282215580
Test: builds
Change-Id: I69456bd7b0b947bb4f26922f31e0988a9862de10
1 file changed