Merge "StorageManager: Introduce StorageManager"