Merge "Fix OWNERS sorting"