Merge "location: rebind to network location and geocoder services after package update" into gingerbread