Cleanup comments, see bug 2401350.

Change-Id: Ieaeeba44b235038ad9b75a57b37658738532df3f
6 files changed