[Updated] Upgrade to Guava 16