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

* commit '2c850fb0a756667401c8eafb044626ee2293089a':
  Check if we require barrier if we did not resolve classes

Change-Id: I495780aefc45e14eb8612c0b6e8ffb093ae3426e