Merge "Rewrite startUsingNetworkFeature for new API" into lmp-preview-dev