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

* commit '9e7efdf3e659c2de002b96ec27589f12c1f01512':
  Add two flags for the latest ckati

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build