Merge "Use the new NetworkStackConnector constructor" am: 97c8cc81a1

Change-Id: Ifaef8916460a4c3c275b9cdf20ee87b562a42785