am 3835e78d: am 08b75cc3: Merge "misc header changes for r10d"

* commit '3835e78ddb791e1f3740dae0a0aca7b7cf97f8fe':
  misc header changes for r10d