Remove assumption that all entities have a fingerprint

Change-Id: Ide4db1e0e95bae4306ba109aa2f560a0f5d0acf8
Merge "Remove assumption that all entities have a fingerprint"