diff --git a/core/java/android/net/NetworkIdentity.java b/core/java/android/net/NetworkIdentity.java
index 1f7defcc82..4e33770bf2 100644
--- a/core/java/android/net/NetworkIdentity.java
+++ b/core/java/android/net/NetworkIdentity.java
@@ -45,7 +45,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
      * {@link #SUBTYPE_COMBINED}.
      */
     // TODO: make this flag configurable through settings. See http://b/146415925
-    public static final boolean COMBINE_SUBTYPE_ENABLED = true;
+    public static final boolean COMBINE_SUBTYPE_ENABLED = false;
 
     public static final int SUBTYPE_COMBINED = -1;
 
diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java
index efa638ad54..8f4c6d02ba 100644
--- a/services/core/java/com/android/server/net/NetworkStatsService.java
+++ b/services/core/java/com/android/server/net/NetworkStatsService.java
@@ -1209,7 +1209,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
             final int collapsedRatType = getCollapsedRatType(networkType);
             if (collapsedRatType == mLastCollapsedRatType) return;
 
-            if (LOGV) {
+            if (LOGD) {
                 Log.d(TAG, "subtype changed for mobile: "
                         + mLastCollapsedRatType + " -> " + collapsedRatType);
             }
@@ -1217,7 +1217,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
             mHandler.removeMessages(MSG_UPDATE_IFACES);
             mLastCollapsedRatType = collapsedRatType;
             mHandler.sendMessageDelayed(
-                    mHandler.obtainMessage(MSG_UPDATE_IFACES), SECOND_IN_MILLIS);
+                    mHandler.obtainMessage(MSG_UPDATE_IFACES), mSettings.getPollDelay());
         }
     }