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

Change-Id: I5218b546fcf6d0234ccaf9d7c74d45ae21e52586