Merge "Rewrite startUsingNetworkFeature for new API"