Merge "Check common.keyring is provided before check common.keyring.admin key"