Fix header parsing

Style fixup replacements broke header parsing.

Change-Id: I5d1d159105256f377352bb5c38a99c8c0248d86b
Merge "Fix header parsing"