Merge "Fixed a race contidion in StorageManagerService"