Merge "Merge "Fix wallpaper backup eligibility test am: f7d1b5de6e" into nyc-mr1-dev am: e022290806 am: c899f55156 am: 9d34ae160d"