Merge "(reland) Retire obsolete kernel files" into main