Merge "Persist version data on a per-volume basis." into mnc-dev