Merge "Rewrite startUsingNetworkFeature for new API" am: 3c271afcb4

Original change: undetermined

Change-Id: I525cf45782ad047c1d962a9c01bdaa4decfb91f7