Cleanup for #inclusivefixit.

Test: treehugger
Change-Id: I44f710cbda4497c9d01a1ff7c1dcdb8f0eda6acc
1 file changed