Merge commit '98e1f3840f06d3dfea987154da25d5351460d080' * commit '98e1f3840f06d3dfea987154da25d5351460d080': Remove races in Geocoder/LocationProvider Proxy
Merge commit '98e1f3840f06d3dfea987154da25d5351460d080' * commit '98e1f3840f06d3dfea987154da25d5351460d080': Remove races in Geocoder/LocationProvider Proxy