Merge "junit tests devicemanager"