Merge "Workaround Guice bug "getPathInfo not decoded"" into stable-2.11