Merge pull request #15241 from saurabh6790/google_maps_settings

Google maps settings