Merge "misc header changes for r10d"