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

Change-Id: I9581f198a8a63f1004222b087c25cd267691c83d