Merge "Use managed guava version"