Merge "Don\'t crash on invalid numbers." into nyc-dev am: 5c401966a3
am: 6c12a6723c
am: 1c59860a81
* commit '1c59860a816f8db920ba6fa7bd2a8a6ef36ca9b6':
Change-Id: Iffb2887cab6021b010a9ce4fefae6a2ca35ec1d6
This commit is contained in: