Merge "Work on issue #37815224: DeviceManagementService is incorrectly..." into oc-dev
am: 72c0ab518a

Change-Id: I1987075221d0d5fa16483e6a41003b0394291d10