Merge "Don't crash if we get a onRemove() callback from Fingerprint" into oc-dev am: b8aaaf82a2
am: 9e6345e1b9

Change-Id: I99c343a6f5dc1e7040d154ad19628cc5777544f5