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

* commit '7e150264857034bd308fdb791e0de0d618f3e231':
  Fix overflow check so it doesn't reject legitimate files