Merge "Don\'t crash on invalid numbers." into nyc-dev
am: 5c401966a3

* commit '5c401966a3106a223eadabb1fbb156160fdd5222':
  Don't crash on invalid numbers.

Change-Id: Ia622b5a3cb31a6ad0a9aebdb1a3cff28c6d4eb04