am e7f9da44: Merge "Clear out ENGINE flags when initializing"

* commit 'e7f9da44646b8eb66ef2e7b163176b5272216e86':
  Clear out ENGINE flags when initializing