Merge changes from topic "connectivity-diagnostics-system-server" am: fd47d34d34 am: 05bea2cbd5 am: 346f8902c2

Change-Id: If70281f2989778896eb34ac65bcfe0215393ef60
tree: 2ae25449758000649fd0afa90f65f5a27f61fae9
  1. core/
  2. services/
  3. tests/