Merge "Telecom: Refactor to move DEVICE_ID_DEFAULT from vdm to Context" into udc-dev