Revert "Refactor Fingerprint code out of EntityView"

This reverts commit 4ec25c6a4adaf8936156672e6f4e7a14d4134899.

Change-Id: Id7e37044f460860d0aa35c47ab1e0b6ab8295a23
Merge "Revert "Refactor Fingerprint code out of EntityView""