Merge "Connectivity: Fix map access"