Fix typos in builder and client Upstream-commit: 5b124d7422c723ae8e403d24afc9e78dc06bbefe Component: engine