Merge remote-tracking branch 'cros/upstream' into 'cros/master'

Change-Id: I25cfc2099713bda5a09eaf4b99527926ebebbe29
diff --git a/src/libmbim-glib/mbim-uuid.c b/src/libmbim-glib/mbim-uuid.c
index 7b0c182..376eeb7 100644
--- a/src/libmbim-glib/mbim-uuid.c
+++ b/src/libmbim-glib/mbim-uuid.c
@@ -256,7 +256,7 @@
     .a = { 0x3d, 0x01, 0xdc, 0xc5 },
     .b = { 0xfe, 0xf5 },
     .c = { 0x4d, 0x05 },
-    .d = { 0x9d, 0x3a },
+    .d = { 0x0d, 0x3a },
     .e = { 0xbe, 0xf7, 0x05, 0x8e, 0x9a, 0xaf }
 };
 
diff --git a/src/libmbim-glib/test/test-uuid.c b/src/libmbim-glib/test/test-uuid.c
index 2e5717e..8cf9781 100644
--- a/src/libmbim-glib/test/test-uuid.c
+++ b/src/libmbim-glib/test/test-uuid.c
@@ -102,7 +102,7 @@
 test_uuid_basic_connect_extensions (void)
 {
     compare_uuid_strings (MBIM_UUID_BASIC_CONNECT_EXTENSIONS,
-                          "3d01dcc5-fef5-4d05-9d3a-bef7058e9aaf");
+                          "3d01dcc5-fef5-4d05-0d3a-bef7058e9aaf");
 }
 
 /*****************************************************************************/