am 2e0d70f9: am 678d556f: Merge "Add snprintf truncation and output error checks."

* commit '2e0d70f98d10089f0cc3b88848d203cb4694fb98':
  Add snprintf truncation and output error checks.