Merge "Integration tests for device role tagging"