am 35387922: Merge "Fix issue #7271589: Cannot set Ocean HD live wallpaper" into jb-mr1-dev

* commit '35387922bd3213ea4c376c7dcfb109da67a6a33e':
  Fix issue #7271589: Cannot set Ocean HD live wallpaper