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

Change-Id: Ie0aea2d976dd7ef13c42709b89ea1c75e50908fa