Use better method to add header

Bug: 52288
Change-Id: I843392c7b7aeeea15093fbc5df61eb72e422d512
Merge "Use better method to add header"