Updated to Guava 17.0