am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev

* commit 'b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
  Only offer migration between private volumes.