Merge "Add support for an existing CompOS cert."