Merge "Simplify logic for connect in MapClientProfile"