Merge "Remove unused variables in RCCacheEntryFactoryTest"