am 10057e4d: Merge "Fix a few incorrect return codes."

* commit '10057e4dbeae5bc7ed495dc9f2342a6596c82c79':
  Fix a few incorrect return codes.