Merge "StorageManager:  Clean up and generalize storage configuration resources" into honeycomb-mr2