am 56d57e88: am 5f130216: Merge "Handle errno properly to avoid corrupt str_parms"

* commit '56d57e88c6ccda0043e879b1a56a7445af8a886f':
  Handle errno properly to avoid corrupt str_parms