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

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