Merge "Change fix for default module's dependency resolver creation into two steps."