Address Java ClosureCleaner Comments SQUASH BEFORE MERGE