Merge "WiFi: Modify OWNERS files"