fix(planning_evaluator): cherry-pick bug fix PRs #2602

Job	Run time
check-if-relevant-files-changed	12s
no-relevant-changes	2s
json-schema-check	0s
	14s

Provide feedback