diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index a7c409de7f4..01a29c67dbe 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -1049,7 +1049,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
                 public void onFailure(int reason) {
                     Activity activity = mFragment.getActivity();
                     if (activity != null) {
-                        Toast.makeText(activity,
+                        Toast.makeText(mContext,
                                 R.string.wifi_failed_save_message,
                                 Toast.LENGTH_SHORT).show();
                     }
@@ -1090,7 +1090,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
         final Activity activity = mFragment.getActivity();
         // error handling, connected/saved network should have mWifiConfig.
         if (mWifiConfig == null) {
-            Toast.makeText(activity,
+            Toast.makeText(mContext,
                     R.string.wifi_failed_connect_message,
                     Toast.LENGTH_SHORT).show();
             return;
@@ -1116,7 +1116,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
                 if (state == STATE_ENABLE_WIFI) {
                     Log.d(TAG, "Turn on Wi-Fi automatically!");
                     updateConnectedButton(STATE_ENABLE_WIFI);
-                    Toast.makeText(activity,
+                    Toast.makeText(mContext,
                             R.string.wifi_turned_on_message,
                             Toast.LENGTH_SHORT).show();
                     mWifiManager.setWifiEnabled(true);
@@ -1137,7 +1137,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
                     stopTimer();
                     // reset state
                     state = STATE_NONE;
-                    Toast.makeText(activity,
+                    Toast.makeText(mContext,
                             R.string.wifi_failed_connect_message,
                             Toast.LENGTH_SHORT).show();
                     updateConnectedButton(STATE_ENABLE_WIFI_FAILED);
@@ -1159,7 +1159,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
                     Log.d(TAG, "connected");
                     stopTimer();
                     updateConnectedButton(STATE_CONNECTED);
-                    Toast.makeText(activity,
+                    Toast.makeText(mContext,
                             mContext.getString(R.string.wifi_connected_to_message,
                                     mAccessPoint.getTitle()),
                             Toast.LENGTH_SHORT).show();
@@ -1170,7 +1170,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
                     stopTimer();
                     // reset state
                     state = STATE_NONE;
-                    Toast.makeText(activity,
+                    Toast.makeText(mContext,
                             R.string.wifi_not_in_range_message,
                             Toast.LENGTH_SHORT).show();
                     updateConnectedButton(STATE_NOT_IN_RANGE);
@@ -1179,7 +1179,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
                     stopTimer();
                     // reset state
                     state = STATE_NONE;
-                    Toast.makeText(activity,
+                    Toast.makeText(mContext,
                             R.string.wifi_failed_connect_message,
                             Toast.LENGTH_SHORT).show();
                     updateConnectedButton(STATE_FAILED);
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
index a7b6772c21f..912fb8c4864 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
@@ -94,7 +94,7 @@ public class WifiTetherSwitchBarController implements
 
     @Override
     public void onClick(View v) {
-        if (mSwitch.isChecked()) {
+        if (((Switch) v).isChecked()) {
             startTether();
         } else {
             stopTether();
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
index eae75d601d0..b955156851d 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
@@ -49,6 +49,7 @@ import android.os.Bundle;
 import android.os.PowerManager;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.util.FeatureFlagUtils;
 import android.view.ContextMenu;
 import android.view.View;
 
@@ -296,6 +297,10 @@ public class WifiSettingsTest {
     @Test
     @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
     public void checkDataUsagePreference_perferenceInvisibleIfWifiNotSupported() {
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
+            return;
+        }
+
         setUpForOnCreate();
         ShadowDataUsageUtils.IS_WIFI_SUPPORTED = false;
 
@@ -307,6 +312,10 @@ public class WifiSettingsTest {
     @Test
     @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
     public void checkDataUsagePreference_perferenceVisibleIfWifiSupported() {
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
+            return;
+        }
+
         setUpForOnCreate();
         ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
 
@@ -351,6 +360,10 @@ public class WifiSettingsTest {
     @Test
     @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
     public void clickOnWifiNetworkWith_shouldStartCaptivePortalApp() {
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
+            return;
+        }
+
         when(mWifiManager.getConfiguredNetworks()).thenReturn(createMockWifiConfigurations(
                 NUM_NETWORKS));
         when(mWifiTracker.isConnected()).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java
index e05541c970a..9addde2b45a 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java
@@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -32,6 +32,7 @@ import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkPolicyManager;
 import android.net.wifi.WifiManager;
+import android.widget.Switch;
 
 import com.android.settings.widget.SwitchBar;
 
@@ -98,14 +99,21 @@ public class WifiTetherSwitchBarControllerTest {
     }
 
     @Test
-    public void onSwitchToggled_onlyStartsTetherWhenNeeded() {
-        when(mWifiManager.isWifiApEnabled()).thenReturn(true);
-        mController.onClick(mSwitchBar.getSwitch());
+    public void onSwitchToggled_switchOff_noStartTethering() {
+        final Switch mockSwitch = mock(Switch.class);
+        when(mockSwitch.isChecked()).thenReturn(false);
+
+        mController.onClick(mockSwitch);
 
         verify(mConnectivityManager, never()).startTethering(anyInt(), anyBoolean(), any(), any());
+    }
 
-        doReturn(false).when(mWifiManager).isWifiApEnabled();
-        mController.onClick(mSwitchBar.getSwitch());
+    @Test
+    public void onSwitchToggled_switchOn_startTethering() {
+        final Switch mockSwitch = mock(Switch.class);
+        when(mockSwitch.isChecked()).thenReturn(true);
+
+        mController.onClick(mockSwitch);
 
         verify(mConnectivityManager, times(1))
                 .startTethering(anyInt(), anyBoolean(), any(), any());