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

Change-Id: I4b143ead6520a0e99d3038f0bec6e5c81ac243ae