Merge "MAP client handle failure to connect."