Merge "Change explicit class to self in AutoloadGenerator"