Merge branch 'master' into release

Change-Id: I56ea2217899e92bdd9d6cb56797ac9895e194fff

cpp/core_v2/internal/client_proxy.h

@@ -23,6 +23,7 @@
 #include "core_v2/status.h"
 #include "core_v2/strategy.h"
 #include "platform_v2/base/byte_array.h"
+#include "platform_v2/base/prng.h"
 #include "platform_v2/public/mutex.h"
 #include "proto/connections_enums.pb.h"
 // Prefer using absl:: versions of a set and a map; they tend to be more
@@ -201,6 +202,7 @@ class ClientProxy final {
 
   mutable RecursiveMutex mutex_;
   std::int64_t client_id_;
+  Prng prng_;
 
   // If not empty, we are currently advertising and accepting connection
   // requests for the given service_id.