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

* commit '2d9d59053fcb8504914f358a1417e67a94c0f8f1':
  Persist version data on a per-volume basis.