Unify Storage vs Rest of World fixture creation

Change-Id: I1b8d602d1baf3ebf5f75c35f3e04efadaa0aa876
Merge "Unify Storage vs Rest of World fixture creation"