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: a2d94e99
* commit 'a2d94e99':
Fix bug where fingerprint for wrong userId was attempted to be removed.
Change-Id: I4b9f0eb86fafdfc430c1939d51f2d584216d3409