Fix a possible integer overflow when adding dates, potentially resulting in
bogus results instead of a proper overflow error.

Change-Id: I1858cad37956aa0efc3018a75e28137697e6a22c
(cherry picked from commit 9655d994cfe3e1319d2e712cf21f6bf0665a2f37)