am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"

# By Henrik Engström
# Via Android Git Automerger (1) and others
* commit '0b515aece642283a25c6a4416f0aecdaf17bdb58':
  Fix possible integer overflow in MtpStorage