Clean up/out some comments. DO NOT MERGE.

Change-Id: I16063cf9132e0f2d6556ce06e1ebfb90ecff05aa
2 files changed