Merge "Don\'t go busy loop when waiting child process."
am: ae2b746c82

* commit 'ae2b746c8274845c64d2d62ddc8f3a0b07a05f35':
  Don't go busy loop when waiting child process.