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: 25c0b7bc
am: 3e385425
* commit '3e385425':
Change-Id: Iefb67eb541ba4ae9afe9a55dab0891bce254d27d