Reviewed-by: dholmes, chegar, mduigou

Reviewed-by: darcy, weijun

Summary: Avoid integer overflow by using long arithmetic
Reviewed-by: martin, dholmes