Re-submit "Remove StoreFactory and related logic"

Commit author: Daniel Kinzler

Original submission: 934445af6d53819c82aad8c7726082574a554b6d

This reverts revert commit 8e0d39da28f8bb41a5e2f7b9e9c0a48e2f477d72.

Change-Id: Id9795a180286dc2d23e91450f74d4250f966752c