Merge "Simplify logic for disconnect and getConnectionStatus in MapProfile" am: beeb35f0de am: 1b9458f0b7
am: d41367dbff

Change-Id: Ifa6c88e31dd2e8089bfd9e7ba74852e0ba993552