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

Change-Id: Iceaac9c460f6e8cebdab07283208a4f974a1ea3c