Merge "Remove dead isolated storage code from StorageManagerService"