Minor updates and fixes to the CONTRIBUTING doc Upstream-commit: 55915b8e002f4be52bfbf18ec7ea0a45f0c663b0 Component: engine