Cleanup for #inclusivefixit.

Bug: 161896447

Test: NA
Change-Id: I8bc5b4be29f91b1884017aa3b4f28d91d9cac419
1 file changed