Merge "Increasing log level of key CFI indicator changes."
am: 6d10d5848b

Change-Id: Ibe2072ba72a380bd79d511b4bb7731d4f0267097