Merge "Remove the old CompOS key management"