Merge "Fix incorrect size of array."