Squashed 'guice/' changes from 1894503..0c3d6ab

0c3d6ab Fix compile errors

git-subtree-dir: guice
git-subtree-split: 0c3d6abea5f1bf2385313f09d46c3db41053dc4e
Merge commit 'dca6694d57f39d59b3dcf191312d8c2039b3e289' into sni/issue-256