Fixed device detection for binding to local and remote services

JIRA-Issue: APPTRAVEL-