I'm not adding Guava in this PR. I can do it in a follow-up.