Merge pull request #3152 from Wikia/release-216-VID-1487-vpt-amd

release-216 fix incorrect amd id