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

Change-Id: Idf3c2ec3ad89f0090fedc07b60a2c4226b176577