PT46608005: Backup/restore does not handle AA prompts
Merge branch 'PT46608005' into release-4.6