Merge "Fix WifiTetherSettingsTest" into rvc-dev