am 5fc756c3: (-s ours) Merge "Rewrite startUsingNetworkFeature for new API" into lmp-preview-dev am: ce66fda8ff

Original change: undetermined

Change-Id: I07f4d4bee2c60b5dd80247c90e4774764de52f35