am 28f07697: Merge "File header cleanup."

* commit '28f07697eb6f4039daae6c9c5efee67a4d85cc92':
  File header cleanup.