am fa71962f: am 46a4e81d: Merge "VPN: delete the "abort" file before starting...
am fa71962f: am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
* commit 'fa71962f':
VPN: delete the "abort" file before starting VPN daemons.