Merge "Locking when clearing VPN source rules." into jb-mr1-dev