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

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