Merge "Migrate deprecated guava methods"