Upgrade to Guava 17