Update Guava to 17.0 with appropriate changes for deprecation