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: Ib762515ea86e8dc9eb475f1a3f0eb472da6447c4