am 6525e67f: Merge "Fix bug in WaitForCompilationToFinish"

* commit '6525e67f3c13033a7d9f93e9a639b401eec0cc78':
  Fix bug in WaitForCompilationToFinish