Update/fix Amazon Cloud Player
Merge pull request #3180 from alebcay/amazon-cloud-player

Update/fix Amazon Cloud Player