Fix Guava imports
Merge branch 'master' into stage