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

Change-Id: Iae96f4e55ff74b48275b1559443ba982bb935bbc