Merge "Check if we require barrier if we did not resolve classes"
am: 207c3ea

* commit '207c3ea34a89b2f912010230c39521d8c4656340':
  Check if we require barrier if we did not resolve classes

Change-Id: I4040743ed8f79d81fb72a5434da568cd384ddb34