Fix incorrect autoloader pointing to non-existing file

Change-Id: I8cfd7abec87148bdce57b15be4cab779cff72e2f
Merge "Fix incorrect autoloader pointing to non-existing file"