Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1