diff --git a/filegroups/suite/compatibility-tradefed.jar b/filegroups/suite/compatibility-tradefed.jar
index 2228e55..2d330b0 100755
--- a/filegroups/suite/compatibility-tradefed.jar
+++ b/filegroups/suite/compatibility-tradefed.jar
Binary files differ
diff --git a/filegroups/tradefed/TradeFedTestApp.apk b/filegroups/tradefed/TradeFedTestApp.apk
index 81be4aa..fd38bd9 100755
--- a/filegroups/tradefed/TradeFedTestApp.apk
+++ b/filegroups/tradefed/TradeFedTestApp.apk
Binary files differ
diff --git a/filegroups/tradefed/TradeFedUiTestApp.apk b/filegroups/tradefed/TradeFedUiTestApp.apk
index 65bdd9d..49edb57 100755
--- a/filegroups/tradefed/TradeFedUiTestApp.apk
+++ b/filegroups/tradefed/TradeFedUiTestApp.apk
Binary files differ
diff --git a/filegroups/tradefed/script_help.sh b/filegroups/tradefed/script_help.sh
index 434c858..3a77189 100755
--- a/filegroups/tradefed/script_help.sh
+++ b/filegroups/tradefed/script_help.sh
@@ -49,16 +49,16 @@
 
 # check java version
 java_version_string=$(${TF_JAVA} -version 2>&1)
-JAVA_VERSION=$(echo "$java_version_string" | grep 'version [ "]\(1\.8\|9\|11\).*[ "]')
+JAVA_VERSION=$(echo "$java_version_string" | grep 'version [ "]\(1\.8\|9\|11\|17\).*[ "]')
 if [ "${JAVA_VERSION}" == "" ]; then
-    >&2 echo "Wrong java version. 1.8, 9 or 11 is required. Found $java_version_string"
+    >&2 echo "Wrong java version. 1.8, 9, 11 or 17 is required. Found $java_version_string"
     >&2 echo "PATH value:"
     >&2 echo "$PATH"
     exit 8
 fi
 
 # check if java is above 9 and supports add-opens
-JAVA_VERSION=$(echo "$java_version_string" | grep 'version [ "]\(9\|11\).*[ "]')
+JAVA_VERSION=$(echo "$java_version_string" | grep 'version [ "]\(9\|11\|17\).*[ "]')
 if [ "${JAVA_VERSION}" != "" ]; then
     ADD_OPENS_FLAG="--add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED"
 fi
diff --git a/filegroups/tradefed/tradefed-test-framework.jar b/filegroups/tradefed/tradefed-test-framework.jar
index 5892783..8e0d2ec 100755
--- a/filegroups/tradefed/tradefed-test-framework.jar
+++ b/filegroups/tradefed/tradefed-test-framework.jar
Binary files differ
diff --git a/filegroups/tradefed/tradefed-tests.jar b/filegroups/tradefed/tradefed-tests.jar
index 304dab1..0540d9b 100755
--- a/filegroups/tradefed/tradefed-tests.jar
+++ b/filegroups/tradefed/tradefed-tests.jar
Binary files differ
diff --git a/filegroups/tradefed/tradefed.jar b/filegroups/tradefed/tradefed.jar
index ce35102..f91618a 100755
--- a/filegroups/tradefed/tradefed.jar
+++ b/filegroups/tradefed/tradefed.jar
Binary files differ
diff --git a/filegroups/tradefed/version.txt b/filegroups/tradefed/version.txt
index 7b059d9..2d76ceb 100755
--- a/filegroups/tradefed/version.txt
+++ b/filegroups/tradefed/version.txt
@@ -1 +1 @@
-8662600
+8733710