Merge "DNG: Clean up logging." into lmp-dev