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