Merge "header-checker: Code cleanup"