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

Change-Id: Ibd99ec5998fc81b302235912076f5df153b5d8ba