Merge "VPN network stat accounting changes."