am 6c3e05c3: am 28f07697: Merge "File header cleanup."

* commit '6c3e05c305294d07b8c0d85ffa60e6d8907bc331':
  File header cleanup.