Merge "Adding SecurityException information to all device logging DPM public methods" into nyc-dev