Comment cleanup.

Change-Id: I8cd8d7133b7394398a1dc4e2fd268d0027da6f9f