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

Change-Id: Ie0f53964c521c89217347be67c16b8fe73ccc09d