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

* commit '1617a83dd7061c08054986ea183d4d160e69b161':
  Implement CFI for Optimizing.