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

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