am 2adccb61: Merge "Ensure class is linked before resolution"

* commit '2adccb618c0de207fde96e5e90ce99c79eb8eb85':
  Ensure class is linked before resolution