Merge "Connectivity: Fix map access" am: a1b71308b5
am: 89c0d57a15

Change-Id: Ice91ac58257551485231da4664027a281237de4b
tree: 68c6c075229a9b30d4caf69a35e293ac00e9c580
  1. core/
  2. services/
  3. tests/