Merge "Use the new NetworkStackConnector constructor" am: 062e45d48c

Change-Id: Ifaef8916460a4c3c275b9cdf20ee87b562a42785