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

Change-Id: I7a7b4b17a4eeeeda7619e6fa9702ef059af7d76f