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

* commit '82fee7bd0a82a48e204bcaf5480701b36c857276':
  Only offer migration between private volumes.