Merge "Revert "Check if we require barrier if we did not resolve classes""
am: 35d6a42

* commit '35d6a426c699da05ee6f962cfbe426b7d638780a':
  Revert "Check if we require barrier if we did not resolve classes"

Change-Id: I4e7cb7257bb9b5949d1d05526c647e8fc1ed48f2