Merge "Revert "Initial KeySet API.""