Migrate from depreated Guava APIs
am: 0a7d717330

Change-Id: I5782a680b99a41b0b1b2a1e215f5ab6655d18be3