Merge "Add self-restore capability to Backup/Restore sample app"