Merge "Protect mtpd socket from VPN"