Merge "Add multi-device tests for CDM." into main