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
am: adb32d45
* commit 'adb32d45':
Change-Id: Id01f28d8b7e804ac7ee4217b25b8ff98dc15c34e