Merge "Revert "Revert "Some cleanups to recovery.""" am: a7a8262944 am: cb3cbaffac
am: b9c3411de7

Change-Id: I630bea739f6f5e49b57a007b69e0bfed5ca4a7ae