Merge "Rename MountService to StorageManagerService."