Merge changes from topic "connectivity-diagnostics-system-server"
am: 880e0654e7

Change-Id: I48a9f1f734b5e2dd4f7ed91c052cec5c8c62c076
tree: 7c886845053383fd8452f0a00fb18c160e228a08
  1. core/
  2. services/
  3. tests/