Merge "[DPM] Minor code fixes in NetworkLoggingHandler"