Merge "header-checker: Remove type_id"