Merge "Revert "Move DEVICE_ID_DEFAULT from VDM to Context""