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

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