Merge "Add null checking to two protectFromVpn calls"