am 1d4c4d42: am 44c1f012: Merge "Return error code when composing PDU fails"

* commit '1d4c4d42edb92a3dd82238eafef23a0bfa0267d3':
  Return error code when composing PDU fails