am fbd67fec: (-s ours) am 0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units

* commit 'fbd67fec87e425cfbbd80926cec8cd345d134b4c':
  DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units