am ae189740: Merge "Add some more headers."

* commit 'ae189740de6b03f06a06214122183a3774f5cb62':
  Add some more headers.