Remove diag mode for cfi

Removing diag mode before release because it is only useful for
debugging.
Bug:158010610
Test: n/a

Change-Id: I7bcd0cc2d3230ed778599605f6c1f263b0310cff
4 files changed