Merge "Better error message for bad array write." am: e13eb650d7
am: 0a1d3d0cf8

Change-Id: I721553e1dc86adca31354e4358d1f540837d95d7