Merge "Remove CFI diagnostics."
am: 64ac8c6301

Change-Id: I1b53ec592c27efb662a6f6204b7346cf8fe0cd80