Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
am: 54c4374b
* commit '54c4374b':
Fix bug where fingerprint for wrong userId was attempted to be removed.
Change-Id: I9f5db7259dc9af79f57d16577c2a9d5481ad31ba