Merge "Added the KeySetManager."