Merge \"Test existence of wallpaper files before backing them up\" into nyc-mr1-dev
am: 8b08553e90

Change-Id: Ic5acc8c87cef80795c3e286f9e24604af35ff6f5