am bfa5d5ba: am fe0e16af: Merge "Updating wallpapers (except for xlarge devices). (Bug 6460469)" into jb-dev

* commit 'bfa5d5bade1e1a6eb41c8425bb3562caa7ad1161':
  Updating wallpapers (except for xlarge devices). (Bug 6460469)