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

Change-Id: I0f2c332719da81447afb695c124d7b6c6c16b80d