am b822d246: am 0a93d875: Merge "StorageManager:  Clean up and generalize storage configuration resources" into honeycomb-mr2

* commit 'b822d2464dc59056f736b0c49f0ac514c7cbb9d9':
  StorageManager:  Clean up and generalize storage configuration resources