Merge changes from topic "connectivity-diagnostics-system-server" am: 9cd249c11a am: 45e0caf5dc am: 1544e76f76

Change-Id: If70281f2989778896eb34ac65bcfe0215393ef60