Merge "Check if we require barrier if we did not resolve classes" into nyc-dev
am: 24a9ecf

* commit '24a9ecf261ebfe079d41d6da7c6ee225c9555d69':
  Check if we require barrier if we did not resolve classes

Change-Id: I15a2068db76574f9308dd2f06d32cfc31db50d63