Merge "Merge "Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am: 56ce19099d" into nyc-mr1-dev am: 2733c16556 am: 9927f7f08b am: 142a8bb2e5"