Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2