am ba9715a8: Merge "Implement CFI for Quick."

* commit 'ba9715a8657e5a0b6cd201b2aa003685cacbb896':
  Implement CFI for Quick.