Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9
am: a1c121e034

Change-Id: I42cc7e9246516b7f6f9feff6f58187cee3b4b89e