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

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