Merge "Fix NPE that can hide guice CreationException on site init"