Merge "Fix overflow check so it doesn\'t reject legitimate files"
am: 7534cb3a36

* commit '7534cb3a36f506f6e2e1cec2e823dad35c5393e9':
  Fix overflow check so it doesn't reject legitimate files