Merge "Stop using startUsingNetworkFeature"