Merge "Remove legacy DeviceLogging methods from DPM" into nyc-dev