Merge "Fix potential bug with reordered size/offset arguments."