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