Merge "Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am: 56ce19099d" into nyc-mr1-dev