Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread