Merge "Support both Clear key plugin UUIDs." into oc-mr1-dev