Merge branch 'master' into release

Change-Id: I1301beacba87281b5818eb5e3f54525919158918

cpp/core_v2/params.h

@@ -18,6 +18,7 @@
 #include <string>
 
 #include "core_v2/listeners.h"
+#include "platform_v2/base/byte_array.h"
 
 namespace location {
 namespace nearby {
@@ -26,11 +27,11 @@ namespace connections {
 // Used by Discovery in Core::RequestConnection().
 // Used by Advertising in Core::StartAdvertising().
 struct ConnectionRequestInfo {
-  // name     - A human readable name for this endpoint, to appear on
-  //            other devices.
-  // listener - A set of callbacks notified when remote endpoints request a
-  //            connection to this endpoint.
-  std::string name;
+  // endpoint_info - Identifing information about this endpoint (eg. name,
+  //                 device type).
+  // listener      - A set of callbacks notified when remote endpoints request a
+  //                 connection to this endpoint.
+  ByteArray endpoint_info;
   ConnectionListener listener;
 };