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

Change-Id: Id44778f1808ac380f86633e932f7a6583502ce3d