Further changes to support modifications of Google Maps/API URLs (#23394)