Merge "header-checker: Remove type_id" am: f253fc4007 am: ac965a442b

Change-Id: Id2740410cd682a75e8fe17e1b7306241ed96e488