Fixed the Autowire issues.

Change-Id: If12cef65c82b9af391175c0c3d6319925ce56c75