Iterate on keys only since value is unused

Change-Id: I6f6404d8da33bb50cfad9e795dc6164dfae5cdc9