Merge "Fix negative array size checking"
am: 38dd0e8f0a

Change-Id: Icd6eba521a54f33d5c2c422aacca20923b8e0967