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

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

Change-Id: Ic7c3fc1c68c72353f7393373690deb9bd85af46a