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

Change-Id: Ieb50e09eebe645de8d3aca58718cf3ee504edb80