Merge "Support pending CompOS keys."