Merge "Fix test for array size orders."
am: 139b69077f

Change-Id: Id48b54f7958088397ba60511d3b2d3388749ba8c