diff --git a/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf b/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf
index 8ce100f34e..030058900e 100644
--- a/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf
+++ b/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf
@@ -47,9 +47,11 @@
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
 
-[Packages.ARM, Packages.AARCH64]
-  ArmPkg/ArmPkg.dec
-  ArmPlatformPkg/ArmPlatformPkg.dec
+# MU_CHANGE [BEGIN]
+# [Packages.ARM, Packages.AARCH64]
+#   ArmPkg/ArmPkg.dec
+#   ArmPlatformPkg/ArmPlatformPkg.dec
+# MU_CHANGE [END]
 
 [Guids]
   gFdtTableGuid
diff --git a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
index c80a029fd1..b08d01ddb3 100644
--- a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
+++ b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
@@ -48,6 +48,8 @@
   MdeModulePkg/MdeModulePkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
 
-[Packages.ARM, Packages.AARCH64]
-  ArmPkg/ArmPkg.dec
-  ArmPlatformPkg/ArmPlatformPkg.dec
+# MU_CHANGE [BEGIN]
+# [Packages.ARM, Packages.AARCH64]
+#   ArmPkg/ArmPkg.dec
+#   ArmPlatformPkg/ArmPlatformPkg.dec
+# MU_CHANGE [END]
diff --git a/EmbeddedPkg/EmbeddedPkg.ci.yaml b/EmbeddedPkg/EmbeddedPkg.ci.yaml
index 2ae32018db..c2b3ae984a 100644
--- a/EmbeddedPkg/EmbeddedPkg.ci.yaml
+++ b/EmbeddedPkg/EmbeddedPkg.ci.yaml
@@ -10,7 +10,7 @@
     },
     ## options defined ci/Plugin/CompilerPlugin
     "CompilerPlugin": {
-        "skip": True,       # MU_CHANGE
+        "skip": False,
         "DscPath": "EmbeddedPkg.dsc"
     },
 
@@ -25,8 +25,8 @@
             "MdePkg/MdePkg.dec",
             "MdeModulePkg/MdeModulePkg.dec",
             "EmbeddedPkg/EmbeddedPkg.dec",
-            "ArmPkg/ArmPkg.dec",
-            "ArmPlatformPkg/ArmPlatformPkg.dec",
+            # "ArmPkg/ArmPkg.dec",                          # MU_CHANGE
+            # "ArmPlatformPkg/ArmPlatformPkg.dec",          # MU_CHANGE
             "NetworkPkg/NetworkPkg.dec"
         ],
         # For host based unit tests
diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
index dad9b32abb..58640502ef 100644
--- a/EmbeddedPkg/EmbeddedPkg.dsc
+++ b/EmbeddedPkg/EmbeddedPkg.dsc
@@ -125,16 +125,16 @@
   ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf
 
 [LibraryClasses.ARM, LibraryClasses.AARCH64]
-  ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf
-  ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
-  SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf
+  # ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf                               # MU_CHANGE
+  # ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf                            # MU_CHANGE
+  # SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf                      # MU_CHANGE
   # NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf         # MU_CHANGE
   NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf        # MU_CHANGE
 
   # Add support for GCC stack protector
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
 
-  ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
+  # ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf                                 # MU_CHANGE
 
 ################################################################################
 #