Merge "Fix bug in error checking in GnssLocationProvider"