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

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