Merge "Fix Build Errors Caused by Papyrus switching to Guava 27"