Snap for 8176975 from 1864ba7b87bf20e35b1e1209b01c12b7b70fd62f to tm-release

Change-Id: Idc5f8484e26279fd851128fd4b6fbf6f41344850
diff --git a/bootloader_message/include/bootloader_message/bootloader_message.h b/bootloader_message/include/bootloader_message/bootloader_message.h
index 0d99273..d58158d 100644
--- a/bootloader_message/include/bootloader_message/bootloader_message.h
+++ b/bootloader_message/include/bootloader_message/bootloader_message.h
@@ -114,7 +114,7 @@
 static_assert(sizeof(struct misc_virtual_ab_message) == 64,
               "struct misc_virtual_ab_message has wrong size");
 static_assert(sizeof(struct misc_memtag_message) == 64,
-              "struct misc_virtual_ab_message has wrong size");
+              "struct misc_memtag_message has wrong size");
 #endif
 
 // This struct is not meant to be used directly, rather, it is to make