Cleanup Followup for EntityView/EntityRevision

Change-Id: I158e3098676034cb7a91ca2035ff49957397b115
Merge "Cleanup Followup for EntityView/EntityRevision"