Merge "MAP client handle failure to connect."
am: 46dc71dc75

Change-Id: I966a8595a648ca7f614b3c50304559cbb18d1809