Merge "Event logging for lockdown VPN state changes." into jb-mr1-dev