Minor comments cleanup

Change-Id: I699a3e3c8d16a5d5cc135264b2e184f8ed980222
4 files changed