am 1ff0d50c: (-s ours) am 5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev

* commit '1ff0d50cd87bff245325d9858c5df710ab238465':