diff --git a/Code/Framework/AzCore/Tests/AZStd/Any.cpp b/Code/Framework/AzCore/Tests/AZStd/Any.cpp
index 4040573462..d6e31ea07b 100644
--- a/Code/Framework/AzCore/Tests/AZStd/Any.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/Any.cpp
@@ -480,7 +480,9 @@ namespace UnitTest
         TEST_F(AnyTest, Any_CopyAssignSelfEmpty_IsEmpty)
         {
             any a;
+            AZ_PUSH_DISABLE_WARNING(, "-Wself-assign-overloaded")
             a = a;
+            AZ_POP_DISABLE_WARNING
             EXPECT_TRUE(a.empty());
         }
 
@@ -491,7 +493,9 @@ namespace UnitTest
                 any a((TypeParam(1)));
                 EXPECT_EQ(TypeParam::s_count, 1);
 
+                AZ_PUSH_DISABLE_WARNING(, "-Wself-assign-overloaded")
                 a = a;
+                AZ_POP_DISABLE_WARNING
 
                 EXPECT_EQ(TypeParam::s_count, 1);
                 EXPECT_EQ(any_cast<const TypeParam&>(a).val(), 1);
diff --git a/Code/Framework/AzCore/Tests/AZStd/FunctorsBind.cpp b/Code/Framework/AzCore/Tests/AZStd/FunctorsBind.cpp
index 58ab71096b..6bfda10ddc 100644
--- a/Code/Framework/AzCore/Tests/AZStd/FunctorsBind.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/FunctorsBind.cpp
@@ -285,7 +285,9 @@ namespace UnitTest
 
             // Invocation and self-assignment
             global_int = 0;
+            AZ_PUSH_DISABLE_WARNING(, "-Wself-assign-overloaded")
             v1 = v1;
+            AZ_POP_DISABLE_WARNING
             v1();
             AZ_TEST_ASSERT(global_int == 3);
 
@@ -294,7 +296,9 @@ namespace UnitTest
 
             // Invocation and self-assignment
             global_int = 0;
+            AZ_PUSH_DISABLE_WARNING(, "-Wself-assign-overloaded")
             v1 = (v1);
+            AZ_POP_DISABLE_WARNING
             v1();
             AZ_TEST_ASSERT(global_int == 5);
 
diff --git a/Code/Framework/AzCore/Tests/AZStd/SmartPtr.cpp b/Code/Framework/AzCore/Tests/AZStd/SmartPtr.cpp
index c852fd35bb..f50da28b1f 100644
--- a/Code/Framework/AzCore/Tests/AZStd/SmartPtr.cpp
+++ b/Code/Framework/AzCore/Tests/AZStd/SmartPtr.cpp
@@ -920,7 +920,9 @@ namespace UnitTest
 
         AZStd::shared_ptr<incomplete> p1;
 
+        AZ_PUSH_DISABLE_WARNING(, "-Wself-assign-overloaded")
         p1 = p1;
+        AZ_POP_DISABLE_WARNING
 
         EXPECT_EQ(p1, p1);
         EXPECT_FALSE(p1);
@@ -950,7 +952,9 @@ namespace UnitTest
     {
         AZStd::shared_ptr<void> p1;
 
+        AZ_PUSH_DISABLE_WARNING(, "-Wself-assign-overloaded")
         p1 = p1;
+        AZ_POP_DISABLE_WARNING
 
         EXPECT_EQ(p1, p1);
         EXPECT_FALSE(p1);
@@ -996,7 +1000,9 @@ namespace UnitTest
         using X = SharedPtr::test::X;
         AZStd::shared_ptr<X> p1;
 
+        AZ_PUSH_DISABLE_WARNING(, "-Wself-assign-overloaded")
         p1 = p1;
+        AZ_POP_DISABLE_WARNING
 
         EXPECT_EQ(p1, p1);
         EXPECT_FALSE(p1);
diff --git a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_Android.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_Android.h
index 9289423b37..b8e83ab8a3 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_Android.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_Android.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include <AzCore/base.h>
-#include <Azcore/PlatformIncl.h>
+#include <AzCore/PlatformIncl.h>
 #include <AzCore/std/algorithm.h>
 #include <vulkan/vulkan.h>
 #include <limits.h>