Clean up commit to reduce duplicated code

Reduce duplicated code and remove unused variable.

Test: atest VpnTest
Change-Id: I9f38bf7e16d821b51ee966607f873c5d39714e3c
1 file changed