Merge "Fix a TODO in BlobStorePerfTests."