Merge "Bump guava version to 18.0"