Remove leading/trailing spaces in builder/parser Upstream-commit: 82191cc3f3b3ea49da6287abdb9c2ba6eb6d253c Component: engine