diff --git a/Code/LauncherUnified/Platform/Windows/Launcher.rc.in b/Code/LauncherUnified/Platform/Windows/Launcher.rc.in
index ae08976c2a..52a238032e 100644
--- a/Code/LauncherUnified/Platform/Windows/Launcher.rc.in
+++ b/Code/LauncherUnified/Platform/Windows/Launcher.rc.in
@@ -1,13 +1,9 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
 
 IDI_ICON1 ICON DISCARDABLE "@ICON_FILE@"
diff --git a/Code/LauncherUnified/StaticModules.in b/Code/LauncherUnified/StaticModules.in
index 03b22b076a..ef5a565480 100644
--- a/Code/LauncherUnified/StaticModules.in
+++ b/Code/LauncherUnified/StaticModules.in
@@ -1,14 +1,10 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
 /////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////
 // THIS CODE IS AUTOGENERATED, DO NOT MODIFY
diff --git a/Code/Tools/Android/ProjectBuilder/build.gradle.in b/Code/Tools/Android/ProjectBuilder/build.gradle.in
index 5980984516..da5f4b599a 100644
--- a/Code/Tools/Android/ProjectBuilder/build.gradle.in
+++ b/Code/Tools/Android/ProjectBuilder/build.gradle.in
@@ -1,13 +1,9 @@
 //
-// All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-// its licensors.
+// Copyright (c) Contributors to the Open 3D Engine Project.
+// For complete copyright and license terms please see the LICENSE at the root of this distribution.
+//
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 //
-// For complete copyright and license terms please see the LICENSE at the root of this
-// distribution (the "License"). All use of this software is governed by the License,
-// or, if provided, by the license below or the license accompanying this file. Do not
-// remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
 
 apply plugin: "com.android.${TARGET_TYPE}"
 
@@ -16,7 +12,7 @@ ${SIGNING_CONFIGS}
     compileSdkVersion sdkVer
     buildToolsVersion buildToolsVer
     ndkVersion ndkPlatformVer
-	lintOptions {
+    lintOptions {
         abortOnError false
         checkReleaseBuilds false
     }
diff --git a/Code/Tools/Android/ProjectBuilder/gradle.properties.in b/Code/Tools/Android/ProjectBuilder/gradle.properties.in
index 71a1cadde9..4ade102ae0 100644
--- a/Code/Tools/Android/ProjectBuilder/gradle.properties.in
+++ b/Code/Tools/Android/ProjectBuilder/gradle.properties.in
@@ -1,12 +1,8 @@
 ###
-###  All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-###  its licensors.
+### Copyright (c) Contributors to the Open 3D Engine Project.
+### For complete copyright and license terms please see the LICENSE at the root of this distribution.
 ###
-###  For complete copyright and license terms please see the LICENSE at the root of this
-###  distribution (the "License"). All use of this software is governed by the License,
-###  or, if provided, by the license below or the license accompanying this file. Do not
-###  remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-###  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+### SPDX-License-Identifier: Apache-2.0 OR MIT
 ###
 
 # For more details on how to configure your build environment visit
diff --git a/Code/Tools/Android/ProjectBuilder/local.properties.in b/Code/Tools/Android/ProjectBuilder/local.properties.in
index 4e82cb2940..e9843fe5c3 100644
--- a/Code/Tools/Android/ProjectBuilder/local.properties.in
+++ b/Code/Tools/Android/ProjectBuilder/local.properties.in
@@ -1,12 +1,8 @@
 ###
-###  All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-###  its licensors.
+### Copyright (c) Contributors to the Open 3D Engine Project.
+### For complete copyright and license terms please see the LICENSE at the root of this distribution.
 ###
-###  For complete copyright and license terms please see the LICENSE at the root of this
-###  distribution (the "License"). All use of this software is governed by the License,
-###  or, if provided, by the license below or the license accompanying this file. Do not
-###  remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-###  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+### SPDX-License-Identifier: Apache-2.0 OR MIT
 ###
 
 ## This file must *NOT* be checked into Version Control Systems,
diff --git a/Code/Tools/Android/ProjectBuilder/root.build.gradle.in b/Code/Tools/Android/ProjectBuilder/root.build.gradle.in
index dfce99c3c7..14606bee7b 100644
--- a/Code/Tools/Android/ProjectBuilder/root.build.gradle.in
+++ b/Code/Tools/Android/ProjectBuilder/root.build.gradle.in
@@ -1,12 +1,9 @@
 //
-// All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-// its licensors.
+// Copyright (c) Contributors to the Open 3D Engine Project.
+// For complete copyright and license terms please see the LICENSE at the root of this distribution.
+//
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 //
-// For complete copyright and license terms please see the LICENSE at the root of this
-// distribution (the "License"). All use of this software is governed by the License,
-// or, if provided, by the license below or the license accompanying this file. Do not
-// remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 buildscript {
     repositories {