Merge "Remove CFI diagnostics." am: 64ac8c6301 am: b89b976d77
am: 6671ea8a46

Change-Id: I4de33cfd8451cceab9ca234d884522e6e9489b08