am a1595487: am ae189740: Merge "Add some more headers."

* commit 'a1595487faadaf48201ff8f91fdf59c8ae0e7b19':
  Add some more headers.