Merge "Rephrase to avoid integer overflow" into mainline-prod