Merge "Check if we require barrier if we did not resolve classes" am: 207c3ea
am: 78933ae

* commit '78933ae9ac0b70b9464b04e175fc15f3980cdee8':
  Check if we require barrier if we did not resolve classes

Change-Id: I4fb70ce061d4aa0113a428d69dcd624eb4c118a0