Merge "Overhaul FusedLocationProvider"