Merge "Storage refactor for EntityConfidence"