Merge "Add initial header checker." am: 322a84666f
am: c5a3275da8

Change-Id: Ibbc78888f013013da507b342afc4de903fbd2d06