Merge "Remove over-comment"