Merge "Send ConnDiags event before revalidating network in CS." into rvc-dev