Merge "Guard against incorrect ID assignment in CdmService" into tm-dev