Merge "Finish issue #37815224: DeviceManagementService is incorrectly..." into oc-dev