am 36c51fc2: Merge "Take into account that we might end up with unresolved classes."

* commit '36c51fc23f7d7330440ecf8de54e69bb68969c05':
  Take into account that we might end up with unresolved classes.