Merge "Fix test for array size orders." am: 139b69077f am: 2248165091 am: 63188f358b
am: 399e739ba6

Change-Id: Id96e43c667043ea1a8c831be75271c8574f1b988