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

Change-Id: I6c8c0455cfd96f653e1080fc0b7265374e3a418d