Merge "Remove guava dependency to speed up build." into jb-mr2-dev