Merge "Revert^4 "Upgrade guava to v30.0""