am e7d6f04d: Merge "Add two flags for the latest ckati"

* commit 'e7d6f04d32c26e1355a1a01008941477c1432611':
  Add two flags for the latest ckati