This reverts commit 20384eea. Reason for revert: Broke HostsideVpnTests Fix: 177943140 Change-Id: I23924181e46fd1f16a60ec420426d1ed39705050