Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices"