am efdb78be: Merge "Upgraded Guava to unmodified jdk5-backport-v17.0-compatibility"

* commit 'efdb78beb238a9caef533bb308e36d7f4abdbeac':
  Upgraded Guava to unmodified jdk5-backport-v17.0-compatibility