HPS: Always pass CardHolderData element

Closes #1298.