Modified Prepare/Secure for Restore

Change-Id: I579d6da639345484138d2402f5d535165634235b
Cleaned up BackupAgent Test and Restore

Change-Id: I6ac8846fdd2c07417ef5c69c818e55e51a6f7f61