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

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

Change-Id: Ia3844343b7b2df964e6500445c664cad386ffb63