Has this been resolved? I appear to be having the same issue even when registering, deregistering and registering again I receive the same token in UPS. Is this possibly linked to AGDROID-486?