Fixed headers and ' characters Upstream-commit: 2b468dc283d1379dd7d24dbdae4de8c92b2ae9ab Component: engine