Cleanup some memory flags used in the CLI Upstream-commit: 83e29a5d87e3c1a0d4a9ae0d6dfe14a9ceb9bb20 Component: engine