Merge "Modify logging in WifiSettings."