Merge "Removed some deprecated guava APIs that have disappeared in version 17." into idea133