diff --git a/.codebuild/run_android_modelgen_e2e_test.yml b/.codebuild/run_android_modelgen_e2e_test.yml
index c40626223..ef6567923 100644
--- a/.codebuild/run_android_modelgen_e2e_test.yml
+++ b/.codebuild/run_android_modelgen_e2e_test.yml
@@ -17,8 +17,9 @@ phases:
       - yes | sudo apt install android-sdk
       - export ANDROID_HOME=/usr/lib/android-sdk
       - yes | sudo apt install sdkmanager
-      # Review SDK licenses
-      - yes | sudo sdkmanager --licenses
+      # Licenses acceptance is needed for Android project build.
+      # "sdkmanager --licenses" is handled in test beforeAll setup,
+      # and this ensures the project accepts all licenses needed.
 
   build:
     commands:
diff --git a/.codebuild/run_canary_android_modelgen_e2e_test.yml b/.codebuild/run_canary_android_modelgen_e2e_test.yml
index 7b909a379..ef07577b3 100644
--- a/.codebuild/run_canary_android_modelgen_e2e_test.yml
+++ b/.codebuild/run_canary_android_modelgen_e2e_test.yml
@@ -15,8 +15,9 @@ phases:
       - yes | sudo apt install android-sdk
       - export ANDROID_HOME=/usr/lib/android-sdk
       - yes | sudo apt install sdkmanager
-      # Review SDK licenses
-      - yes | sudo sdkmanager --licenses
+      # Licenses acceptance is needed for Android project build.
+      # "sdkmanager --licenses" is handled in test beforeAll setup,
+      # and this ensures the project accepts all licenses needed.
 
   build:
     commands:
diff --git a/packages/amplify-codegen-e2e-tests/src/__tests__/build-app-android.test.ts b/packages/amplify-codegen-e2e-tests/src/__tests__/build-app-android.test.ts
index f33502834..e41f564c4 100644
--- a/packages/amplify-codegen-e2e-tests/src/__tests__/build-app-android.test.ts
+++ b/packages/amplify-codegen-e2e-tests/src/__tests__/build-app-android.test.ts
@@ -38,6 +38,8 @@ describe('build app - Android', () => {
     await addCodegen(projectRoot, {
       frontendType: AmplifyFrontend.android,
     });
+
+    // Required to accept all licenses needed per this test project build
     await acceptLicenses(projectRoot);
   });