Merge "Reconcile private volumes when mounted." into mnc-dev