Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 am: 0c571e5923
am: 3456ee19f9

Change-Id: Ia3b0e970555a256d0576a2b94c2f6825f279de7c