Merge "Fix dpm force-network-logs"