Merge "Fix BlobStoreFactoryTest @covers tag"