Merge "Change some line comments to multi line comments"