Fixes bug with scan on hash key attribute

Closes-bug: #1362239
Change-Id: I8e071f77743a46b0e62ab4016242415b108acd08
Merge "Fixes bug with scan on hash key attribute"