Merge from google internal, fixing nested class injection/generation and add some extra ClassName tests.