Upgrade to guava 17