Merge "Increasing log level of key CFI indicator changes." am: 6d10d5848b
am: c9cb664f8f  -s ours

Change-Id: Idb020e578ee7a20fd3e500fda5c7e780b6e2d969