Merge "Remove StorageManagerServiceTest"