Small changes from #11967 for review comments Upstream-commit: e64f6baf116771b22a3050cf686624dbb6b19f37 Component: engine