Merge "Add null checking to two protectFromVpn calls" am: 335d482d9d
am: afbdf60e1d

Change-Id: I85e0fd5ffdee88af50158c09b776ff2615b9e85a