Merge "Avoid writing to a zero-capacity buffer."
am: 166dfd6f49

Change-Id: I5e2b310ca1ad82ea155161de0b37d2e2d47757bd