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

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

Change-Id: I57b5dcbd5860099546bb513c0e8d6aeefd873a4f