Merge "Fix ContactLoaderTest."