Fix (Auto Generate) handling for backup names

Change-Id: I29f3823d03c005fb55a0e0a98818d40bd1eb039d
3 files changed