am c6afba4a: Merge "MtpService: Recreate MtpStorage objects each time MTP starts" into jb-dev

* commit 'c6afba4a1f00c5f98c6bc0eb9d5718921ae3c192':
  MtpService: Recreate MtpStorage objects each time MTP starts