Merge "Fix negative size when size is greater than 2,147,483,647" into sc-dev