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

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