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

Change-Id: I0069f3f9de111b23f7e26be3b7d14728d45d0a4c