am 88c3301c: am 2d9d5905: am 25945302: Merge "Persist version data on a per-volume basis." into mnc-dev

* commit '88c3301c309726da74d03b00ada3e505b3fdbc5a':
  Persist version data on a per-volume basis.