am 98bf75b4: am 0eadc764: Merge "Add error codes."

* commit '98bf75b4fd685373f3331b0a73ee7a2978bbec03':
  Add error codes.