Merge "Tweak OWNERS list"