Reviewed-by: darcy, weijun
Reviewed-by: jccollet
Update implementation to use long instead of int Reviewed-by: michaelm