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

Change-Id: I14af2d3d5c4b5e87990136a0625778e5fb367454