Merge "Use the new NetworkStackConnector constructor" into rvc-dev am: 2404bc617a

Change-Id: Icf470e9e5f308a6575c98ad2f9f4a867c3e32e1e