Merge "Remove CFI diagnostics." am: ebd8c69ac5 am: 9267f7a253
am: 7dac08bb5b

Change-Id: I67ac542950e6f2b8a65909b6f5c46ad52430f51c