[automerger skipped] Merge "Simplify logic for connect in MapClientProfile" am: 0ac2a840a0 am: e7374ba2c7
am: f9c56d0aea  -s ours

Change-Id: Iac09e4c684648cb8ea001c48cc64066e6d305e13