Merge "Service for OEM lock management." into oc-dev