Some comment fixes

Change-Id: Ie397eabe8322608fd58ba2a6f999d9f9e08aface
Merge "Some comment fixes"