am b9227cd0: am d3b54de9: am 8dbff580: Merge "Return the correct error code in multi-thread mode"

* commit 'b9227cd05d0751774bda5c915dea0276123576b3':
  Return the correct error code in multi-thread mode