Merge "Remove CDM entries in Connected Device." into sc-dev