Merge "Unit tests for Active device manager" into pi-dev