diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 72938cc25..f3ce5d496 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -240,7 +240,7 @@ jobs:
       # Build and publish locally for the test app to find the SNAPSHOT version
       - name: Build ${{ env.PACKAGE_NAME }}
         run: |
-          ./gradlew :android:crt:build --debug --stacktrace --scan
+          ./gradlew :android:crt:build
           ./gradlew -PnewVersion="1.0.0-SNAPSHOT" :android:crt:publishToMavenLocal
       # Setup files required by test app for Device Farm testing
       - name: Setup Android Test Files
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4635ad00f..86778fb6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ function(aws_get_cmd_arguments)
     get_cmake_property(vars CACHE_VARIABLES)
     foreach(var ${vars})
         get_property(currentHelpString CACHE "${var}" PROPERTY HELPSTRING)
-        if ("${currentHelpString}" MATCHES "No help, variable specified on the command line.")
+        if ("${currentHelpString}" MATCHES "No help, variable specified on the command line." OR "${currentHelpString}" STREQUAL "")
             if("${var}" IN_LIST AWS_GET_CMD_ARGS_VARS_TO_IGNORE)
                 message(WARNING "Skip ${var}")
                 continue()