Merge "Send Keystore2 logs to SYSTEM rather than MAIN"