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

Change-Id: Icbf3295eca37703f2ca41bd78914c5434fa26bdc