Merge \\"Back up wallpapers via staged copies, not hard links\\" into nyc-mr1-dev am: 47f73c4733
am: 53fb2a4a38

Change-Id: I53ecd9e9ba2e90dd5f03c33ff1ad22aeb884de59