Merge "Fix error checking in append_string" am: e2e2b2d3d3 am: 33e2002540

Change-Id: Ia3c7b38e0400ebd045fa67cfa914f7880840e77d