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

Change-Id: If84767d4ef185072bd94b73e570f7f403d2a3d2f