Use autowired method if exists in adding new dependency (#6652)

Use autowired method if exists in adding new dependency (#6652) #31820