Merge "Add VPN logs"