Implement basic support for recovery

Bug: 122316490
Change-Id: I11f716bf73fe3ea9a8bebd0fbbe5cdd1ffb0838c
6 files changed