Merge "Keystore2: Fix some log messages."