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

Change-Id: If62c0b8d106549b9afc7b6a92c3b382e0f206653