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

Change-Id: I42b6aaa1193d7695db468d234ea50adf9282a7aa