Merge "KeySetManager: convert comments to Javadoc"