Cleanup on CL 61012

Change-Id: I394909c65a4978be26db063c9f69f1098ab028b3
1 file changed