Merge "Modify Wi-Fi settings owners file"