Fix shocco errors

Clean up comments to fix errors seen while processing with shocco

Change-Id: I0e97ad27613313f03e47c107051ea93b115d4744
Merge "Fix shocco errors"