Bug 1053786 - [v2.1] Fix Everything me test failures
Merge pull request #22888 from chirarobert/update_geoloc_setup

Bug 1053786 - [v2.1] Fix Everything me test failures