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

Change-Id: I8798113d8c5d3e8fd11e12e6ea03fbaa10bb0077