Move comments to the correct position

Change-Id: I06e5f42f9b88cd78a0c008326091cba6134c9877
Merge "Move comments to the correct position"