Merge "Remove getDevicesForStream" into tm-dev