KeyId moved to commons package.