Backport guava update

Cherry pick the guava update commits to backport to 2.5.x