file state: comment -> comment_, to avoid shadowing outer func
Merge pull request #5127 from hulu/file-comment-shadowing

file state: comment => comment_, to avoid shadowing outer func