General cleanup of files touched in G101851

Change-Id: I424ef5bcae8c9efb6e87accfc56b6f373b781beb