Use BeanManager.resolve to eliminate ambiguities (#14421)

Change-Id: I019d2feb3a995da453a62f72cace96ec720b1bb3