Merge "Connectivity: Fix map access"
am: a1b71308b5

Change-Id: I3c1fea926fda1d70e38746378191100bb825758f
tree: 4d4715bf02e0a12cc224d6d17654e0f83fb5a13c
  1. core/
  2. services/
  3. tests/