Fixes an issue validating max integer values

Change-Id: I897f33df9d8faf34a4d4a69b0e351d85200e7fda
Closes-bug: #1329478