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

Change-Id: I6bf23b1716706aaa757170ec3a60062ff4fcb1e0