Merge "Remove unused code and cleanup parameters for DPM dev ID access"