[CM Merge] Recovery

Change-Id: I7b711605731c80504324404303097580f651c00c