Remove redundant key comment, fix key type

Change-Id: I28b26cbbb29d9da12436cefbd9609b13a178140d