Merge "Unit tests for Active device manager"