Add support for abandon/restore

Change-Id: I5f85220978c769c16405e188ae88822844a74d95