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