Cleanup for #inclusivefixit.

Test: treehugger
Change-Id: I651689e2d59c017a9bde44251d95b57e594f0b5b
2 files changed