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

Change-Id: If7fe15d2dbc3375dbf24d0636670b3c4df44ceef