Edits and fixes based on review. Upstream-commit: 95e169a6a14b46c9db6b6d316524b28abfdc3391 Component: engine