am 171336be: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '171336be126743cf9042971fd076b955ad596ffa':
  Wrap system calls in TEMP_FAILURE_RETRY.