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

Change-Id: Ibfd67eb57fdbd578bb0154498e6fc1ef13738c9c