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

Change-Id: Ie24a9df629ef47d1d75ddb1c3bdf72b01f69db37