Merge "Switch recovery to versioned policy and split into components." am: d1499e32 am: f9e44ce1 am: 26f58cc7 Change-Id: I04624ba1a8fa59d8064a4f67ae90b6c007050ce0