Backport guava update

Cherry pick the guava update to backport to 1.5.x.