Merge "Simplify logic for connect in MapClientProfile" am: 0ac2a840a0
am: e7374ba2c7

Change-Id: I1b45c319378904de15b82e28ed2340df79de11d1