Cleanup file comment blocks

Change-Id: I8aa2db02fe0c90cf638bdc2d799476fb48784600
Merge "Cleanup file comment blocks"