am 917f0866: Merge "Implement CFI for Optimizing."

* commit '917f0866f66d3465fa41ddcf9ab09eba2fa78dd3':
  Implement CFI for Optimizing.