Pass key name as parameter to message.

Change-Id: I670308cb3fac71f8ecfcd575d34132cde1e2907a
Merge "Pass key name as parameter to message."