Merge "Fix error checking in append_string"
am: e2e2b2d3d3

Change-Id: Ica7e466b74db7f7927ec9855b8a119b454cbc996