Merge branch 'main' into avm99963-monorail

Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e

GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/framework/cloud_tasks_helpers.py b/framework/cloud_tasks_helpers.py
index a00fa0d..bd9b7f9 100644
--- a/framework/cloud_tasks_helpers.py
+++ b/framework/cloud_tasks_helpers.py
@@ -12,7 +12,7 @@
 from __future__ import print_function
 
 import logging
-import urllib
+from six.moves import urllib
 
 from google.api_core import exceptions
 from google.api_core import retry
@@ -91,7 +91,7 @@
       'app_engine_http_request':
           {
               'relative_uri': url,
-              'body': urllib.urlencode(params),
+              'body': urllib.parse.urlencode(params),
               'headers': {
                   'Content-type': 'application/x-www-form-urlencoded'
               }