Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev am: c7136b3b3c
am: 9b2c0bf87e

Change-Id: I3631edf2a9f0e76b9670ba6bbfc1905c1503ff7c