am bc892446: am 74fb957e: Header cleanup

* commit 'bc8924467eae6cc5dc456cb1fbe4ec97b5b9cf9b':
  Header cleanup