Merge "Switch recovery to versioned policy and split into components."