Merge "Simplify logic for disconnect and getConnectionStatus in MapProfile" am: beeb35f0 am: 1b9458f0 am: d41367db Change-Id: Ifa6c88e31dd2e8089bfd9e7ba74852e0ba993552