Fix some incorrect autoload definition

Change-Id: Idcdb33b90c6cf82b214373c9f6f3ebf9d3e4b549
Merge "Fix some incorrect autoload definition"