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