diff --git a/extern/GmsApi b/extern/GmsApi
index bfe649fc..51509859 160000
--- a/extern/GmsApi
+++ b/extern/GmsApi
@@ -1 +1 @@
-Subproject commit bfe649fc36a40e2498f1ecf123edfb9278fe0a1d
+Subproject commit 51509859ae51097ad5789ba4ca2e9ffb9658f80e
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index 2a7ff302..ed54aa5f 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -65,7 +65,7 @@ def execResult(...args) {
     return stdout.toString().trim()
 }
 
-def gmsVersion = "17.4.55"
+def gmsVersion = "17.7.85"
 def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))
 def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').substring(1)
 def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD"))