Merge "Connectivity: Fix map access" into pi-dev
am: 1fff4c000d  -s ours

Change-Id: I03b95b31613c6cfd702497e822c5690f78547b21
tree: 8986caf776080a56a268e5113cbc0111f82e0fbb
  1. core/
  2. services/
  3. tests/