move autoload require

Change-Id: I8d95849ab3d42a0b77bba90b753d1bf3a3d857c5