Merge "Consolidate OWNERS files and add hackz@ and myself" into main