A few changes/fixes for amp subgraphs #11253

Job	Run time
Clippy linting	1m 36s
Run integration tests	4m 39s
Subgraph Runner integration tests	3m 1s
Build in release mode	1m 29s
Run unit tests	3m 14s
Check rustfmt style	19s
	14m 18s

Provide feedback