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

Change-Id: Iae96f4e55ff74b48275b1559443ba982bb935bbc