release-request-d9dc98f7-19b2-484c-b4d1-f35dc43e9c05-for-git_oc-mr1-release-4152006 snap-temp-L91700000079405440

Change-Id: I7a3f58cc4c3996b8ef1d3a77f0d9433124841675
diff --git a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
index 2ae589a..8000f97 100644
--- a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
+++ b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
@@ -137,7 +137,7 @@
     StrCat (UnicodeArgs, SerialNoArgs);

   }

 

-  BdsLoadOptions->OptionalDataSize = 512;

+  BdsLoadOptions->OptionalDataSize = StrSize (UnicodeArgs);

   BdsLoadOptions->OptionalData = UnicodeArgs;

   BdsLoadOptions->Description = NULL;