Merge "Fixed a crash where the overflow number wasn\'t initialized" into nyc-dev
am: 8f4f2a9

* commit '8f4f2a9bfcc9520f95f58cdedc570c5df8a1c7de':
  Fixed a crash where the overflow number wasn't initialized

Change-Id: I59800de91d7322a3656e3b28e9b73145df7ed141