Merge "Lock access to managed services." into oc-dev