am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev

* commit 'c66b90fecd06691535157e6b00088de61b51dc41':
  Generate stable MTP storage IDs.