Merge "Revert "Fix backup for users hit by erroneous backup disabling"" into nyc-mr1-dev am: b24489e20a
am: d469c4e8b6

Change-Id: I79bfb43f89e1d345731cc7abcf534fe65db596c0