Merge "header-checker: Code cleanup" am: 3fc148f690 am: 24015b58e8
am: db37d35fa8

Change-Id: Ia318e3e23398f7b98d3aa680125fc3b83a68f5a6