Merge "Update Contacts for guava 27.1"
am: b239b66a45

Change-Id: I210c87d2704faf63db067b918af1bcd3f0e1b87d