Merge "Make VPN more testable and update NC during network change"