Merge "No-op refactoring of VPN lockdown status check."