Comment cleanup.

Change-Id: I7e6cc5360431887559ded5cd36c5274fdd5aba47