Merge "Make dependencyResolver protected in generated code"