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

* commit '0dbf20444f3dbfacb3ca23c4fa58872224c71a9a':
  Implement CFI for Quick.