Merge "target: init: Change data type to prevent integer overflow"