Merge "Fix component ID for dumpstate OWNERS" into main