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

* commit '058bd2ecbcf8057511b00685eddc4ff5061bdbc1':
  Return error code when composing PDU fails