am 58beca46: am ba9715a8: Merge "Implement CFI for Quick."

* commit '58beca46c740f5c9ae4857892944575b52b7aa04':
  Implement CFI for Quick.