Handle file-level comments

Change-Id: I3cc371278bddc68b16a5ca3a036012c483f5ef87
Story: 120