Merge "Fixed DeviceStateMonitor unit tests"