am fb10a760: am 79204a32: am 15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev

* commit 'fb10a760c660385d1abbd0ed45d0a72bb812e6d4':
  Fix volume naming when surfaced over MTP.